Merge "Introduced AppRestrictionsLock" into oc-mr1-dev
am: f6b8e4fda5

Change-Id: I36bb6f749485615da42b22b8dbf0fdd99a725710