Merge "Make carrier service persistent binding more robust" am: e4ab1a35

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



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