[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: c702a9ea -s ours am: 648fbe1e -s ours am: 60427167 -s ours am: 8d9f27ab -s ours am: 28f71e71 -s ours am: 15b97225 -s ours

am skip reason: Merged-In I0ee92a22dd6b3d505899c896b9cb5ec2fbd521f6 with SHA-1 85078731 is already in history

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



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