Merge "Add Emergency Number Test Mode" am: 7403fbee81
am: 758b6a41fe

Change-Id: I0b99dee0fe81314521909daa0bdd9a5262298f25