Merge \"Merge \\\\\\\\\\"DO NOT MERGE: Add pm operation to set user...

Merge \"Merge \\\\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\\\" into lmp-mr1-dev am: d327d73e am: cb7e0643 am: 76c9d707  -s ours am: 6ae7a5f7 am: 322e70ce am: a730e597 am: cbe258aa  -s ours am: 5b285891 am: dbd5480a\" into nyc-mr1-dev-plus-aosp
am: 894dd710  -s ours

Change-Id: I26b62d08e1e5185b2395615348ea5007cb5973fa