Merge "Refactor functions into EmergencyNumberTracker" am: db05d9bf76
am: cd656cbfcc

Change-Id: I8649a02abd813dcacd78531422a85871db7e9aa4