[automerger skipped] Merge "Connect IRadioConfig 1.1 HAL interfaces with...
[automerger skipped] Merge "Connect IRadioConfig 1.1 HAL interfaces with RadioConfig.java" am: 51373fdb am: 6b089e56
am: 34fc69f3 -s ours
am skip reason: change_id I02472803eb0f0b07b884fe657a71296052ad25a2 with SHA1 7640ee45 is in history
Change-Id: I386d146d3f36bdf7f3f5f8a347af36b4f32a0f2d