Merge "Don't reset sys.usb.configfs during userspace reboot" am: 03aaecbd99

Change-Id: I4f9df78cc5efb8e8bb032b226742fe05642f0f02