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

[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 8ded89b1 -s ours

am skip reason: Merged-In I10ff6a5df76852f0a22fe3ac22df764528f07423 with SHA-1 b2abff5d is already in history

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

Change-Id: Ic94d11c1683489b10e322569fd09a8cf44c0b2eb