Merge "Change format emergency number test mode"
am: 7e69391c8a

Change-Id: Id98b3f74628915bb24fad5783f6f1babffb6f80f