am 4daf9b1b: Merge "UsbDeviceManager: Don\'t start UsbDebuggingManager when data is encrypted"

# Via Android (Google) Code Review (1) and Benoit Goby (1)
* commit '4daf9b1ba5d898ac874197543dbd949360edcc45':
  UsbDeviceManager: Don't start UsbDebuggingManager when data is encrypted