[automerger skipped] Merge "Revert "Unbind CS if connection is not created...

[automerger skipped] Merge "Revert "Unbind CS if connection is not created within 15 seconds."" into udc-qpr-dev am: 78ac273a -s ours

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

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



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