[automerger skipped] Merge "Make carrier service persistent binding more...

[automerger skipped] Merge "Make carrier service persistent binding more robust" am: e4ab1a35 am: 62f17c0a -s ours

am skip reason: Merged-In I09313571239da6a017a02b22aba247c94b45a35d with SHA-1 9e73af69 is already in history

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



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