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