[automerger skipped] Merge "Add Emergency Number Test Mode" am: 783400c390 am: 4c12798e56
am: dc458b1aa2 -s ours
am skip reason: change_id I4ea3539e3b814b71e03e956d4a857ec20141fa8c with SHA1 cb4bd3a30f is in history

Change-Id: I7b8236b9a66eb3b2815ae3065c81cd266507147d