[automerger skipped] Merge "Set up IRadioConfig 1.3" am: bdb8b6cf20 am: dd02481cee
am: c147f40b77 -s ours
am skip reason: change_id Ia5ca23e07eda0d4db8a8c701181c073745abb094 with SHA1 97dc04f02a is in history

Change-Id: I7e131fcb37a92404c91ee40e0955802bd62e65ae