[automerger skipped] Moved SimStateToString to TelephonyManager am: e87f96e3...

[automerger skipped] Moved SimStateToString to TelephonyManager am: e87f96e3 am: a568175a am: 67418371 -s ours

am skip reason: Merged-In I15a4f0504980211e17a7a1c5c0e21c9c1e9e0c98 with SHA-1 727b169f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2506732



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