Merge changes from topic "am-602a36de9fc14ea3871da6178dee1e2d" into...

Merge changes from topic "am-602a36de9fc14ea3871da6178dee1e2d" into tm-d1-dev-plus-aosp am: 79ba9e2f -s ours

am skip reason: Merged-In I8ef3137394011fb679a1129f80f6351fb05a4eff with SHA-1 2a42e554 is already in history

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



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