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

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

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

Change-Id: I77ff6264a0aa610431167cdc9f9717573cad053b