[automerger skipped] Skip rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 2d717e91f1 -s ours am: bc9378c6f7 -s ours

am skip reason: Change-Id I51672944372d24483679d6f81df4e80869d3fd99 with SHA-1 3c11d4611a is in history

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

Change-Id: I5cec545c8da81d507e2803f4a761c42431aeaea8