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: Ie027e875ec6b1829ac84e929848f4ae3a7acb833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>