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

Change-Id: Iefce26ffbfe22f56fe47a807ba5ed52e6f072d00