[automerger skipped] Revert  "Unbind CS if connection is not created within 15 seconds." am: 85078731fb -s ours am: 9a0571cb4c -s ours

am skip reason: Merged-In I30caed1481dff5af2223a8ff589846597cee8229 with SHA-1 f8659b6921 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/28727099

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