Merge "Allow notifications to be hidden from lockscreen at a package level." into nyc-dev