[automerger skipped] Merge "Add Emergency Number Test Mode" am: 7403fbee81 am: 758b6a41fe
am: d1d0946bb2 -s ours
am skip reason: change_id Id2a814f2532b489484fa28a3c7e78abbb57240aa with SHA1 f4ca7ed3a8 is in history

Change-Id: Ibea81c9921edf79fa80e59c6c61749ae03b538a4