[automerger skipped] Merge Android U (ab/10368041) am: e737fd0a -s ours

am skip reason: Merged-In Idda5d816c2a012afa35658f1b2d86ae2787c1faf with SHA-1 4801c65d is already in history

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



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