[automerger skipped] Merge "Add Radio AIDL to VNDK" am: 355f3459 -s ours am:...

[automerger skipped] Merge "Add Radio AIDL to VNDK" am: 355f3459 -s ours am: a10ffc2c -s ours am: 720d0286 -s ours am: 2b1a5167 -s ours

am skip reason: Merged-In I95d089fb23c4a3baa7f7a6c1435099f34a1af5a3 with SHA-1 c68e0808 is already in history

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

Change-Id: Id852d176361eef3a9a4c193473a11239c9cbde53