Resolve differences in IRadio

Test: branches are the same
Bug: 62999900
Change-Id: I67fe8b95ab81638563faba6fff43e5f60dc2aca5
(cherry picked from commit 0255501b335ae660a7b68f9152e6b9bb8d72a56e)
1 file changed