Merge "Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am: 1975240f17 am: 830874dbe7 am: 88672d7d29" into nyc-mr2-dev-plus-aosp
am: 49950e68b2

Change-Id: I6d111eb8c4afef7cb0615153c2949b0a3cf2155d