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

Change-Id: Ic125ca433e6d013d919f144aa62fb0dc6270dbcf