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

This reverts commit 7b9354ad4f9bd0794035e53e526ed922e5fa9129.

Reason for revert: Causes NPE (b/293458004); will submit a clean fix after revert
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:31db0b4fe9c15e888613b1d49b6d81af49e23653)
Merged-In: I5ba64d9bc2e17c85fe8380ff54c99dc125e9b9f9
Change-Id: I5ba64d9bc2e17c85fe8380ff54c99dc125e9b9f9
7 files changed