[automerger skipped] Skip ab/6749736 in stage. am: fd4abc5e72 -s ours am: 054a3f817f -s ours

am skip reason: Change-Id I876aaf6bba933c964a3573d8053cc60829b3a5fa with SHA-1 e9317d2d74 is in history

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

Change-Id: I1af7aee356927bb93b031c1deafc7cd00b89f848