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

Change-Id: I82b84cd3d74269fa3e381ff8d0c43a23fb061ea8