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

Change-Id: I0973225c5125e0549757f609d52f58031e447f5d