Merge "incidentd: Adding Notification Listener and Disabling Effects Data to NotificationManager proto output."