[automerger skipped] Merge "Change format emergency number test mode" am: 7e69391c8a am: 74d5294b9b
am: a43c20166c -s ours
am skip reason: change_id I2b2cb61d7e4d91e665839b71f1ea55f7d3ef3a77 with SHA1 6321e6dc90 is in history

Change-Id: Ib062ea523f878fec4802454e9eefc488563ebc81