[automerger skipped] Merge "Empty merge of...

[automerger skipped] Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: 45efd40e -s ours am: 4de9cd20 -s ours

am skip reason: Merged-In I595722ca59686d450ff522987a15ce283d3607e0 with SHA-1 24da73c0 is already in history

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



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