[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: 255f5ae7 -s ours am: 0e59a72c -s ours am: af09e2e4 -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: Ia5c0c80bd437670ce60ee1042dfeecf41520563a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>