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

This reverts commit 59052739.

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

Merged-In: Ib845c6d52c5839b12cb9f8fa8b72cd0c7b10dbe5

Merged-In: I32fe284a867f1fbd3aa3064023723186a2ba529f

Merged-In: I0ee92a22dd6b3d505899c896b9cb5ec2fbd521f6

Change-Id: Ic020da295236d857df1adcf4f8a5c99d50b8fc42