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