Merge changes from topic "am-c0be0e080b15444ab222d4ee931ea859" into...

Merge changes from topic "am-c0be0e080b15444ab222d4ee931ea859" into udc-d1-dev-plus-aosp am: 3ec1c2e5

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



Change-Id: I2ecaee049b8d5a778294d632dc9a95b9e787bbac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>