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

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

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