[automerger skipped] Merge "EmergencyNumber enhancement" am: b158b12cbb am: 8af07a9e24
am: d78fdd83b2  -s ours

Change-Id: I4dc222d4d83d69bb29068353ed609de40ad4be0c