Merge changes I36c6ef4b,I3c31394e

* changes:
  Allow UsbDeviceManager to start adbd again.
  Remove key from adb_keys if user forgets the key.