Make carrier service persistent binding more robust am: 9e73af69 am: 68844b1f

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



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