Merge "Add both Emergency Number listener for testing" am: 46cf71d1d0 am: 69eabb2397
am: bbcbf281d1

Change-Id: I864072e7c077ab95fd5619bfbccf0b3bee54e225