Merge "UsbDeviceManager: Check PTP FileDescriptor properly"