[automerger skipped] Revert "Unbind CS if connection is not created within 15...

[automerger skipped] Revert "Unbind CS if connection is not created within 15 seconds." am: b6967b43 -s ours am: ece83aaa -s ours am: d9756c7c -s ours am: c0b1b8c6 -s ours am: fbfb6f93 -s ours am: 13448e58 -s ours am: 3361cea8 -s ours

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

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



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