Merge "Fix NotificationManagerTest.checkNotificationExistence" into marshmallow-cts-dev am: 963acab06f am: 5ca2d83f1b
am: 811f828e70

* commit '811f828e70da37f92075413f1a1c6755bf95dcd0':
  Fix NotificationManagerTest.checkNotificationExistence