[automerger skipped] Use supported locale replace the result from sim info. am: e9360cd21d -s ours am: c9dcc092b7 -s ours am: b3d000c856 -s ours

am skip reason: Merged-In Id29bd66c14d7a5415b3d5b2905a2301846780c70 with SHA-1 0b59d2987c is already in history

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

Change-Id: I28418bc7cc5cf324f1369deba946e08ca60ddf45
Signed-off-by: Automerger Merge Worker <[email protected]>