[automerger skipped] Revert  "Unbind CS if connection is not created within 15 seconds." am: 85078731fb -s ours am: 5dde92622d -s ours am: 5d33115c7d -s ours am: c1ecf6dfc4 -s ours

am skip reason: Merged-In I30caed1481dff5af2223a8ff589846597cee8229 with SHA-1 f8659b6921 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: Ibc2501fa46fd2445d2988677b161ff128627c238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>