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

Merge \\\\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\\\" into lmp-dev am: b43fe629  -s ours am: 96676a2d am: a9b937b2 am: 47da8a0b  -s ours am: e01775f0 am: 5e41f90a am: 80e72074 am: 565d13f1  -s ours am: e4e424d8
am: d049736c

Change-Id: I1d644b84222e6820fb84a49fca296dc245efb958