[automerger skipped] Allow #disconnect to be called safely on connection...

[automerger skipped] Allow #disconnect to be called safely on connection timeout (2/n) am: 0c56d28a am: 68569ea6 am: 12525995 am: de9fa754 -s ours

am skip reason: Change-Id Idf77207124494bd78770b8ea5d9ac4b1fd1a490a with SHA-1 c27e56b3 is in history

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

Change-Id: I9440e716b8e6fed4e3218a677a9e1ccdc2ed6018