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

am skip reason: subject contains skip directive

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

Change-Id: I95831e167d886f75baf72eddf3caf39525c66ddd