Merge "Make Mtp FFS allocations per session rather than per file" am: 3f6419d0e5 am: 57b71e605e
am: 8a91cf1510

Change-Id: I6ea428e9002851843d2b6f86450a0f378f1e92ac