Merge "Revert "USB: ensure parent device is resumed for child's system-resume""