Merge "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am:...

Merge "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 818495e2 -s ours am: 47fb2759 -s ours am: dea81b41 -s ours" into sc-v2-dev-plus-aosp am: c9439991 -s ours

am skip reason: Merged-In I1503e40bd55ad8595965e407abeb2df9e1b183e4 with SHA-1 610c2e58 is already in history

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

Change-Id: I7369cdb7472c2db119aa2709b6d82c5c94166bb7