[automerger skipped] Merge "Add IRadio modules to VNDK" am: 1c0557ea -s ours...

[automerger skipped] Merge "Add IRadio modules to VNDK" am: 1c0557ea -s ours am: c1932a3b -s ours am: 18cda72b -s ours am: 26d33bd7 -s ours am: dc0f73a0 -s ours

am skip reason: Merged-In Ia468b563c6485464db56b3c9cdbae80de6b3f165 with SHA-1 84fdadfe is already in history

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

Change-Id: I69af1f520c91194faba0b6403a0ff6461b4449da