[automerger skipped] Merge "EmergencyNumberTracker and ServiceStateTracker...
[automerger skipped] Merge "EmergencyNumberTracker and ServiceStateTracker fetched by ImsPhone" am: e2bb817e
am: 9e9fd81e -s ours
am skip reason: change_id I7a1e73bbceed68da73b9985bf7396edf4cfb3c12 with SHA1 804376ec is in history
Change-Id: Iea40bb8bd35f6eca7901e6b7abb6319103e1fdd2