Merge "Use supported locale replace the result from sim info." into tm-qpr-dev am: 61f792376b am: 0843ae4c6a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/20074717

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