[automerger skipped] Merge "Cleanup IRadio/IRadioConfig HAL" am: f107b4231e am: 32a891a587 am: 7a84bd0392 -s ours
am skip reason: Change-Id Icbfe35d472ab3f7fd6cd50b4888e3c478dd29fd2 with SHA-1 fc16668e86 is in history

Change-Id: I0beb1b7ae6a8a77effd510a5bc6c45bc602ac022