[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 818495e295 -s ours am: 47fb2759e4 -s ours

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

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

Change-Id: I88bc38c1079443da24fb5b24dee67dd9ae928dda