[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: d7568489 -s ours am: 0c981040 -s ours

am skip reason: Merged-In I026ad515c20a042f87d3ce580c28745e68c0f939 with SHA-1 b6c257d3 is already in history

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

Change-Id: I19e0995b13822cae094a9c4b75ccf6d6a5953526