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

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

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



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