[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: b8042c8705 -s ours am: 8330ca8c4e -s ours am: ff7d4a3eb4 -s ours am: 9506aad8a3 -s ours

am skip reason: Merged-In I1a3e3f0be9b79ec4c309be8e257afbacd1336cdc with SHA-1 0f3b76b764 is already in history

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

Change-Id: I6fa5758a5897098e263c9046b7f4a61c94dedfd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>