[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: c921adfabf -s ours

am skip reason: Merged-In I816926c0ed685b880a8aac520d654e653347cc8a with SHA-1 5626984392 is already in history

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

Change-Id: I395d80b5852785bc7f814f81e4d5f108ead641b2