[automerger skipped] Merge "Add Emergency Number Listener in Telephony" am:...
[automerger skipped] Merge "Add Emergency Number Listener in Telephony" am: 60efbf06 am: 6da0f791 am: fba62e79
am: b20e01a8 -s ours
am skip reason: change_id I0e08a491088d5ef45d1496bde9fd9fde3c7bebfb with SHA1 31a90957 is in history
Change-Id: Ife0aeedcac556a7da2d7fe57e3de1a7213f724f8