Resolve differences in IRadio

Test: branches are the same
Bug: 62999900
Change-Id: I67fe8b95ab81638563faba6fff43e5f60dc2aca5
1 file changed