Merge "Cleanup RadioOnHelper and supporting methods" into oc-dev-plus-aosp
am: eed6d26c44

Change-Id: I118e75a0f82c3876ba1a3130cbc9aaf114e37b15