[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-f77dc857f7594b2882bb7442cb9f1463" into sc-v2-dev-plus-aosp am: d15fb4b3 -s ours

am skip reason: Merged-In If9eae254045bef9a0c0963213721fc12a9f463cb with SHA-1 4fd7dc7d is already in history

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

Change-Id: Ia0c9a3f19d50da426797dadef2b4572ec12c739d