[automerger skipped] Merge "Merge RQ2A.210305.007" am: a952c55f -s ours am:...

[automerger skipped] Merge "Merge RQ2A.210305.007" am: a952c55f -s ours am: fc8f576c -s ours am: 16da0889 -s ours am: 23870fca -s ours am: 324e425f -s ours

am skip reason: Merged-In I90dcd247e1541f3bf7f16d95c7cef6256ae462aa with SHA-1 4de32b2f is already in history

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

Change-Id: Ie0c3ef22a87f597145adf3ca707af825e85c3867