[automerger skipped] Revert  "Unbind CS if connection is not created within 15 seconds." am: 25b876cd69 -s ours

am skip reason: Merged-In I32fe284a867f1fbd3aa3064023723186a2ba529f with SHA-1 21b958609e is already in history

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

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