[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master...

[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 93a82013 -s ours am: d6ea0f0c -s ours

am skip reason: Change-Id Ib926b7c326204ae7341c8c090e24ae6d62d39372 with SHA-1 d2b8cb26 is in history

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

Change-Id: Ia9f2df814b89bd2d2df1a473e5f26c7bb1643733