[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: 85078731 -s ours am: 9a0571cb -s ours am: 2f32c5d5 -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/+/28727099



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