Merge "Refactor functions into EmergencyNumberTracker"
am: db05d9bf76

Change-Id: I75baf0c9664b4ed48175261291112772020b25ab