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

Change-Id: I82328f4dac5a0831fcf7f526f1277da5ad05c431