Merge "Always update SPN upon locale changed" into udc-dev am: 6fb7057d am: b43b7e77

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



Change-Id: I0fb0d5646b7d5645d579134d5624d80b9cbd2852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>