am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit 'aa7e396f':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"