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

Change-Id: Ie95427a7ee05c01d58a7440ff78cb0ae77646297