Merge "Adjust DISALLOW_USB_FILE_TRANSFER checks."