Merge "Clean up unused AppPermissionsPreferenceController"