Merge "Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps."