[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: ccf52418 -s ours am: fb8e325f -s ours am: 06a967c9 -s ours am: 00e8f94d -s ours am: bf3cd023 -s ours

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

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



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