[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "presubmit-am-4cd8cd324e7e4d359a3ec54800a0c725", "presubmit-am-724cd6e390214cefa6370a38673590b7" into tm-mainline-prod am: 4d756e60 -s ours am: 93addffa -s ours

am skip reason: Merged-In I1010ec66d8551fcc1e2d9119be7ecdba22186607 with SHA-1 4169a25f is already in history

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



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