[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: db8910bf0c -s ours am: 3bec84ed54 -s ours am: 1c5681eee8 -s ours am: 83293654d7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I60d5eb915e8d9b5d801c257ee3804d6db9dcfb80