Merge "Make Mtp FFS allocations per session rather than per file"
am: 3f6419d0e5

Change-Id: I8a4b7b7134b1426f3c2e1f854618362eea9602c0