[automerger skipped] Merge 10952656 am: b38b15ca -s ours

am skip reason: Merged-In I9bc9ea2b2760af5b57dd69463658bff3b8e74d9d with SHA-1 e0207858 is already in history

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



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