[automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 709e5f5389
-s ours
am skip reason: Merged-In I9bc9ea2b2760af5b57dd69463658bff3b8e74d9d with SHA-1 e02078582f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/25090849
Change-Id: I97787ebd6bac0e318f40ce0bd758f026770c6e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: