[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: aff8d9e93d am: 5626984392 am: 7cdfe3fc5f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iedaa363d05dfa8d67bc3eea5de2035aec0ff979f