Merge "DO NOT MERGE Refactor EmergencyCallHelper -> RadioOnCallHelper am: 5e0ffbe1ac am: a70eb99011" into nyc-mr2-dev-plus-aosp
am: 7aa5eb1992  -s ours

Change-Id: I793a9da8325dc831d6f45b66d28f6bd408445618