Make carrier service persistent binding more robust am: 9e73af69 am: 5e96eb6c

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



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