Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907"...

Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: f96858a8

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



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