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

Change-Id: I741e0a5899d9734bf35c50853cccb95211cb1d70