[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: 42307c80c7
-s ours am: 0c29b6d365
-s ours
am skip reason: Merged-In I1421fb0dbcdb759281259abfae7bddc9aecdaa56 with SHA-1 3d6cfd14d3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/19093933
Change-Id: I4d3b582883bfc28710bc9d6b5b541fdc6969c5f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: