Merge "Fix a NPE in NotificationManagerSerivice.cancelNotificationFromListener" into lmp-dev