Merge "Update NotificationManagerTest to work with FLAG_BUBBLE in BubbleExtractor" into rvc-dev