[automerger skipped] Skip ab/6749736 in stage. am: 4177367a -s ours am:...

[automerger skipped] Skip ab/6749736 in stage. am: 4177367a -s ours am: fc010d53 -s ours am: e11b8467 -s ours

am skip reason: Change-Id Iee28a5365320f99997d4ac528655786d49316373 with SHA-1 40abfc5d is in history

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

Change-Id: I50f0405d295faada2a7728e415b9877be01f12b0