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

Change-Id: Ie5889eaf76de78868479dead29d3fb9bd897f101