Merge "Smart actions and replies feature should not be guarded by ... AUTO_DEMOTE_NOTIFICATIONS"