[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L72800000960451564:N93200001365390015" into udc-dev am: 51babf3c am: 871f1fde -s ours

am skip reason: Merged-In I6090b4b74cedb6d129fcbeef58d075c8ccdcc4e2 with SHA-1 cf61e3c5 is already in history

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



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