Merge "Added Nullable annotations to NotificationManager API"