[automerger skipped] Merge "Refactor functions into EmergencyNumberTracker" am: db05d9bf76 am: cd656cbfcc
am: fe5af7781e  -s ours

Change-Id: I5b1f11289c5c6f1bfdd64c2e4072dc9292de1d1a