[automerger skipped] Merge "Improve some logs for EmergencyNumberTracker" am:...
[automerger skipped] Merge "Improve some logs for EmergencyNumberTracker" am: ad0b2b5b am: a8ba60d5
am: f9bc6c92 -s ours
am skip reason: change_id Ica94aa903f5710e13de482c6a54aabae6fddf5ae with SHA1 821bc3f8 is in history
Change-Id: I60ddde558f9f1ef034c7184c88e5362abb83da6c