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

Change-Id: I4b67c2555a5402cb9583c57a74db609e3d6c50cd