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

Change-Id: Id3a38cd67eebf2ea5dad4a00bc8ecd63458e563a