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

Change-Id: I6ea4f15c5f95436cb2830316ec965b7f9449741e