Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" into oc-dev
am: 3a958a09d2

Change-Id: If10f8cf662369ecbb95bc6f04388271a535cd259