[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 2bbaa4f0 am:...

[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 2bbaa4f0 am: 23a9661d am: 350d402f -s ours am: 4c314a0a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie5b07feb85ed3d38ddc1ceeb5d5fd69a9c52ed99