[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 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: I01dca3a1918c7486db7d2d24dc5aacba908a3eb3