Merge "MtpPacket: Add finite timeout for bulk transfer" am: e0bc1a9b8e am: 8918b09949
am: f981c6e930

Change-Id: I265eea36edaa6e625b34b6c8a7415eb0ef5cebea