Merge "Merge "Put usb stream into standby on disconnection if offloading" into oc-dr1-dev am: 8f3ad15ee5 am: a226338f43" into oc-mr1-dev-plus-aosp