Merge "Fix NotificationManagerServiceTest hangs."