[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-e6c2558d3a3d4032b6519ea0b4d08f77" into rvc-d1-dev-plus-aosp am: 8dcdc760 -s ours

am skip reason: Change-Id I215124a9b35a2ad50ad562079d392e3d33da11f4 with SHA-1 72cabc62 is in history

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

Change-Id: Icb75ef09fc71987953e9158b5cfa68c190f21706