[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 313fdb5812
-s ours am: a5a98bdf49
-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: Ie4a70928454409515073637be4d3d79b5c705fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: