[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 12e48a85fb am: 35c828e5ae am: 640c6943a8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I842ba6c219a4ea07646591c52f92333c2d0265c4