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

Change-Id: I1afe2d28788d73afbd2b326cbde9669c94bee64e