[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am:...

[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: db8910bf -s ours am: 3bec84ed -s ours am: 1c5681ee -s ours

am skip reason: subject contains skip directive

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

Change-Id: I39a10d5ae21117f15a4eab8c6f8ccb499196b02a