tree b1264f802260ccf7cba9d16a198b26121376c6e5
parent c1f7e46319d85b2f7f224068f8ab7349c1462861
parent db8910bf0c69bf641c3c248422781e3b5c060f71
author Bill Yi <byi@google.com> 1641577729 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641577729 +0000

[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