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

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

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

Change-Id: Id16d4bba9c85f8d60250a3464af00e0cdc69b373