[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 6d3993bab0 -s ours am: fa896ec4d9 -s ours

am skip reason: Merged-In I3aa37a2a54caa0974cce0e3ec678845c19e33788 with SHA-1 e93c95aa15 is already in history

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

Change-Id: I6036ae8a4365c49e79d4f150fab1725106392f23