Merge "DefaultPreferencesFactory: Remove fallback for null PermissionManager"