Merge "Optimize reporting for DangerousPermissionState atom"