Merge "Revert "Don't run permissioncontroller_app in permissive mode""