Allow #disconnect to be called safely on connection timeout (2/n) am:...

Allow #disconnect to be called safely on connection timeout (2/n) am: 0c56d28a am: 68569ea6 am: 12525995

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

Change-Id: I45169e0e371bd0f110b3da9542dac9b618b91f21