tree d624eff3e388a865997b37632cbcee3747f0b7fc
parent 44d966552e0668ba24d1b56518b53e947d42fb5c
parent 509a45ce732fffc8ea04bd7d211e49fcbdb62897
author tom hsu <tomhsu@google.com> 1678249094 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678249094 +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: 509a45ce73 -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: I754a90441c6a430b2929b17b3c42270dc0438781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>