Merge "[Notification] Fix NotificationManagerServiceTest" into sc-dev