[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 891a5f7c8d -s ours

am skip reason: Merged-In I012cfb9b01e5d21ec71700c3c52ac9c096cd1a90 with SHA-1 999fceb07c is already in history

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

Change-Id: I83dc2e0a7cf630d668ddaf71854b7ec3fcfba529