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

This reverts commit 352f84281ed2f6938120b05e56c6b04686463225.

Reason for revert: Causes NPE (b/293458004); will submit a clean fix after revert

Merged-In: Ib845c6d52c5839b12cb9f8fa8b72cd0c7b10dbe5

Change-Id: I7700c031e3e456dc9420b129b5a5fb597ac54182
6 files changed