[automerger skipped] Merge "Merge Android 12 QPR1" am: 235d1d65 -s ours am:...

[automerger skipped] Merge "Merge Android 12 QPR1" am: 235d1d65 -s ours am: 8f933c71 -s ours am: 76ff4f22 -s ours

am skip reason: Merged-In Id6edfe90aadae4db1b23c5bc0de4981170ba42f2 with SHA-1 344c737b is already in history

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

Change-Id: I1c13c602c77eac48d8c77490d6088de1d44a4f0d