[automerger skipped] Merge "Integrate emergencyDial 1.6 in telephony" am:...

[automerger skipped] Merge "Integrate emergencyDial 1.6 in telephony" am: f8a10fb6 am: 91197d68 am: 762fe1d4 am: c900aedd -s ours

am skip reason: Change-Id Ie359c187ed8e94fc81000de1dade4dfe76dcb0ec with SHA-1 5e0b5359 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1582523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I683dda1152b811009eddfe4aaa421fd8c7b71856