Revert "Unbind CS if connection is not created within 15 seconds."

This reverts commit 7aa55ffca65d6166145fd9660e0f7340c07053bf.

Reason for revert: NPE

(cherry picked from commit aa443e673ee0e1ca984117025955cbd0614f2f87)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:95588c25993a5a3cfdbf05765af77d1b1fe72f86)
Merged-In: Ib845c6d52c5839b12cb9f8fa8b72cd0c7b10dbe5
Change-Id: Ib845c6d52c5839b12cb9f8fa8b72cd0c7b10dbe5
4 files changed