[automerger skipped] Revert "Unbind CS if connection is not created within 15 seconds." am: 730240ecb9 -s ours

am skip reason: Merged-In Ib845c6d52c5839b12cb9f8fa8b72cd0c7b10dbe5 with SHA-1 aa443e673e is already in history

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

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