[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L80700000960770298:N69600001370607907" into udc-dev am: dabeb50e am: 3194f115 -s ours

am skip reason: Merged-In I645c013c39e3190fd96c4a549d39a331aced16bd with SHA-1 2c9e8d61 is already in history

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



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