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

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

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



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