Merge "Remove @SystemAPI from NotificationAssistantService"