Merge "Refactor EmergencyCallHelper -> RadioOnCallHelper" into stage-aosp-master
am: 0f2bb4ba34  -s ours

Change-Id: Ic50cca66475cde017e2a15f4287a2916a95b64c2