tree 546989fc3700de9d4f6b8c9a81456741eb9c0d40
parent 70fbaff2617e25bf91bd4814e64408bbc7a4c64d
parent dea81b4162377a28ffb939ae61429aac28ab3a9d
author Xin Li <delphij@google.com> 1629232328 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629232328 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 818495e295 -s ours am: 47fb2759e4 -s ours am: dea81b4162 -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: I4e83b03d6a760025c8d0c9ad3abef8416fb7ca5d