Merge "incidentd: creating PolicyProto for NotificationManager"