Merge changes from topic 'usb_bugfixes'

* changes:
  Automatically turn on adb for userdebug and eng builds.
  Fixed handling of usb state during adb changes.
  Refactored setCurrentFunction and setUsbDataUnlocked into single method.
  Remove the kick from config switches in UsbDeviceManager