[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: 21b95860 -s ours am: f88773d7 -s ours am: 6a04117f -s ours

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

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



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