Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-dev
am: b43fe62933  -s ours

Change-Id: Iad1cc5368a6617b648866cde91e51e5c0b8d68f5