am 6fa60f0e: am c2560fd4: am c94ea9aa: Merge "Fix a NPE in NotificationManagerSerivice.cancelNotificationFromListener" into lmp-dev

* commit '6fa60f0e36fd51700bc13ec3548880a5023f7fcf':
  Fix a NPE in NotificationManagerSerivice.cancelNotificationFromListener