Merge "Set Root.FLAG_LOCAL_ONLY for MTP roots." into nyc-mr1-dev
am: 5e252cecd1

Change-Id: Ic6ff84db074e5fa9770833cff4fcfa720f78cf6f