Merge "Fix NotificationManagerServiceTest for AAOS." into sc-dev