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

Change-Id: I944d6ba7f7446bd071998583b06ab671dea208fc