Merge "Cleanup RadioOnHelper and supporting methods" into stage-aosp-master am: 72f594dae7  -s ours
am: a837932818  -s ours

Change-Id: I3fdd3e8946eafb4fd1d5645c1315d540cfe1734d