[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 6ae8e3ae -s ours

am skip reason: Merged-In I5105da1b8da411d3a4b968d69a547de9e70e66ee with SHA-1 3b432309 is already in history

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



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