Merge "Don't autogrant permissions on managed profiles" into oc-mr1-dev
am: b6cf707632

Change-Id: Id161a3fd805c7554ebb1799a358354e719ebde10