Merge "Add onActionClicked in NotificationAssistantService"