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

[automerger skipped] Merge "Add IRadio modules to VNDK" am: 756e5308 -s ours am: 1393ebb0 -s ours am: 79b13afe -s ours am: c90121ff -s ours am: ab897f86 -s ours

am skip reason: Merged-In Ifdf60903e715cae26a06501aeb3c578f94d207fd with SHA-1 519c2211 is already in history

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

Change-Id: Iff4f28233c7d24e40741e1e5014a116a399bcfe8