[automerger skipped] Merge "Add Emergency Number Test Mode" am: cc7a441d am: d2b27406
am: 48ef6215 -s ours
am skip reason: change_id I45fb6a94e4ff1ae789b6f96cdd6e74583c69b06e with SHA1 fe010584 is in history
Change-Id: I7b5789700f7c399b97faeaffd267bbd0e82fd0d6