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

Change-Id: I78f9c0ce677528e83690911a95f06ea9c8a86f8f