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

Change-Id: I783c3653ab7191472d8399977ffe3a9aa38fa2fd