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

Change-Id: Ie2066bfc97c977056fe114332e5bf11ffc468644