Merge "UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state"