Merge "Support for NotificationAssistantService to rerank notifications."