Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: f96858a818 am: 89dd3c7e38

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

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