Merge "Fix multiuser access to setNotificationPolicy"