Merge "Adjust IRadio 2.0 check for testRebootRadio" into stage-aosp-tm-ts-dev