Merge "NotificationManager: droiddoc documentation improvements"