Allow #disconnect to be called safely on connection timeout (2/n) am: 0c56d28a19 am: 68569ea618

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470701

Change-Id: I229063cf0f85a110a15c9aa4dd6ca013f1c06a96