Merge "Add most basic aspects of permission usage to PermissionManager"