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

am skip reason: Merged-In Ieed7c5966700bdda4ffd51c108d4c02a58b6b452 with SHA-1 c921adfa is already in history

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

Change-Id: I64396e6a24649f41201047c5895751bfbaaa0ced