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

[automerger skipped] Merge "Add Radio AIDL to VNDK variant list" am: d2432e66 -s ours am: e6ceefc0 -s ours am: 7aadb039 -s ours am: e20cb9b2 -s ours am: f1d36ccf -s ours

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

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

Change-Id: I5cf13a8796061200df11a297e0a81083263df685