Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into...

Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 9ac39c47 -s ours

am skip reason: Merged-In I648a1af9e16787dfcfeefa2b2f2e4a72cac2c6a6 with SHA-1 2d30b890 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2186984



Change-Id: Iebbbc82040a8b9f9126b17e5be21f669bd79e86d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>