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

Change-Id: I14b8b59e09e41ec4d0032bb9e5551d35b2a05540