Merge "Revert "adb: close ep0 on disconnection." am: 8c4076295e am: 8edfe2040b" into nyc-mr1-dev-plus-aosp
am: 7288b3bf50

* commit '7288b3bf50b7bfe41439fbd70910a21e00bd36ad':

Change-Id: I28f0e20de182f06a36811539f661987161b82cc6