Merge "Add Emergency Number Test Mode"
am: 783400c390

Change-Id: I5c831c92ef0a24496f7aabc1d0a50a5ee493cb26