[automerger skipped] Merge "Add Radio AIDL to VNDK variant list" into...

[automerger skipped] Merge "Add Radio AIDL to VNDK variant list" into stage-aosp-master am: 40eb29e3 am: f678e574 am: f5905fa3 am: c611d968 -s ours

am skip reason: Merged-In I922961b8311d024ebbf3f3339dfdb41c72ee9dd9 with SHA-1 c10d5da3 is already in history

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

Change-Id: Ibfa4cc3cde72bd5badb32b08126ef6a289df70a0