Merge changes from topic "tc_change_23050307_33" into udc-dev-plus-aosp am:...

Merge changes from topic "tc_change_23050307_33" into udc-dev-plus-aosp am: bbf78479 am: ef162c1f

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



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