Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9
am: 76c9d70756  -s ours

Change-Id: I860be1d599fe60603b37ba8388a20c44c37d6f68