Merge "SimpleManualPermissionEnforcementDetector: conditional ERROR level incident"