Merge "Merge "Put usb stream into standby on disconnection if offloading" into...
Merge "Merge "Put usb stream into standby on disconnection if offloading" into oc-dr1-dev am: 8f3ad15e am: a226338f" into oc-mr1-dev-plus-aosp
am: 95bf75d9
Change-Id: I559e3f5a972e3ab8cd1838916482bd933a9c079e