Merge "[automerger skipped] Merge "Emergency Number format" am: e5709bf75f am: 9c9d146ab4 am: b18e114c41 -s ours am skip reason: change_id Icc9083ed4d6cdae22c3ede9433433ac8eeec4918 with SHA1 0197a96e8a is in history"