Merge changes from topic "cherrypicker-L72800000960451564:N93200001365390015"...

Merge changes from topic "cherrypicker-L72800000960451564:N93200001365390015" into udc-dev am: 51babf3c

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



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