[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: d3264889 -s ours am: 42cc85fa -s ours am: 9a0c8393 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idffa846eae56ad8b642b9607a91e1f22461cf290