[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891"...

[automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: 91c58581 -s ours am: 37810922 -s ours

am skip reason: Merged-In I4fecfba711c0d3d7a22f4fdf7684924a9457b464 with SHA-1 a91ba254 is already in history

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

Change-Id: Iaa369a485baf42018935d485b16ee0a71efad0d4