Merge "Remove ViewNotificationService entry from Contacts manifest"