Merge "Revert "Allow signature apps to modify notification policies.""