Make carrier service persistent binding more robust am: 9e73af69 am: 99f45cb5 am: 944c87a6

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



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