[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: d4777b44 -s ours am: 77015df5 -s ours

am skip reason: Merged-In Id217503f7f4423df25ae89eea305c2b2d3412a6a with SHA-1 3ba15f27 is already in history

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

Change-Id: I02a17a450a0c27963e365e4a782b7bf121b848e6