[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 2bbaa4f010 am: 23a9661d5c am: 350d402f94 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6458a85d2428a4fb1946895ea75ed09b6965fc40