Merge "Merge "adbd: add logging to troubleshoot usb issues." into oc-dr1-dev am: 4ee59e0b51 am: 60364171da" into oc-mr1-dev-plus-aosp