[automerger skipped] Allow #disconnect to be called safely on connection timeout (2/n) am: 0c56d28a19 am: 68569ea618 am: 125259951c am: de9fa75444 -s ours
am skip reason: Change-Id Idf77207124494bd78770b8ea5d9ac4b1fd1a490a with SHA-1 c27e56b349 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470701
Change-Id: I9440e716b8e6fed4e3218a677a9e1ccdc2ed6018
This commit is contained in: