Merge "API changes for IRadio AIDL conversion"