Merge changes from topic "cherrypicker-L80200000962011019:N58900001388333251"...

Merge changes from topic "cherrypicker-L80200000962011019:N58900001388333251" into udc-dev am: 06f546f9

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24104319



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