[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am:...

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ade32af7 -s ours am: 5a454d18 -s ours

am skip reason: Change-Id Idc15c7280ab625d015801313ae71bf04a5abdf81 with SHA-1 1c87c957 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/13122703

Change-Id: I32b1f718aa85f80d6ef5f2b62778e4ccf74e238f