[automerger skipped] Merge "Merge Android R" am: 141c2027 -s ours am:...

[automerger skipped] Merge "Merge Android R" am: 141c2027 -s ours am: 789d1d08 -s ours am: a56f7d26 -s ours

am skip reason: Change-Id I477d2dfba05718c829fdb2099248a8baba1125ab with SHA-1 8743ef4e is in history

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

Change-Id: Ib0d73f9b471d4cb9834da5c25aaeae2a53ade075