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

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

am skip reason: subject contains skip directive

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

Change-Id: I1a8ce13e13033b375c6d8b3a6de0c11e0c7132aa