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

Change-Id: Id59600306c8b99dbf7a76c6a46ee16a3454368e0