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

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

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

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

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