Merge "UsbDeviceManager: Check PTP FileDescriptor properly"
am: a0a67862aa

Change-Id: Iec90d582bd3efae558f0b6a1f6c790d56cc6ce4f