Merge "Make DefaultPreferencesFactory depend on PermissionManager."