[automerger skipped] Merge "Cherrypick aosp/1318079 and aosp/1324841" into...

[automerger skipped] Merge "Cherrypick aosp/1318079 and aosp/1324841" into rvc-dev am: feee5548 am: 4c8e5a8d -s ours

am skip reason: Change-Id I9f91f1b761286f489d175eb0772f78f702e8a2d6 with SHA-1 18d98bc3 is in history

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

Change-Id: I7a06cec9a4b4e1ca254197f54a413d338ebbc033