[automerger skipped] Merge "Fix where country change results in emergency...

[automerger skipped] Merge "Fix where country change results in emergency number update failure." am: 4e6f9a75 am: 71c318ee -s ours am: bfe51372 -s ours

am skip reason: Change-Id I377fa53111dfcffd92d050b652b3ed29c8354492 with SHA-1 fbec086d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd0f35d98c48a64efc26e46b9575f7ef273a6617