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

Change-Id: I70df6ac9cf0c39d4c59bbe79c18388dbe23419c2