Merge "Add special attribution cases to PermissionUsageHelper"