Merge "Typo in javadoc of NotificationManager#addAutomaticZenRule"