[automerger skipped] Merge "The phone didn't reload the allowed Network Type"...

[automerger skipped] Merge "The phone didn't reload the allowed Network Type" am: c68a450e am: 5b588081 am: 2eb76fc6 -s ours am: 12340836 -s ours

am skip reason: skip tag Change-Id I028405f8f19a1db3d6102a4e5269ca98b5cef8ad with SHA-1 e346fe4a is already in history

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

Change-Id: Ic7096bbebbfe0541fc5babc9d09c9aa3a95ceb6c