[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: b8042c87 -s...

[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: b8042c87 -s ours am: 8330ca8c -s ours am: ff7d4a3e -s ours

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

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



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