tree cb0438fe9b5ce1167515cbec11ca77d28252a8dd
parent 721e227da6cbeac5439f44d06078ccb262399581
parent b3d000c8560ba80cd5632be3559b80ad095ce68f
author tom hsu <tomhsu@google.com> 1678246840 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678246840 +0000

[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 <android-build-automerger-merge-worker@system.gserviceaccount.com>