Merge "Add ffs.mtp.ready triggers to mtp configs." am: a06ac26dd1 am: c6faf65758 am: 78a4f0f567
am: c9fd178fb0

Change-Id: I09be5a5f34f81b8594184cf64d6897349aa9c82f