Merge "Fix Robo test fail at NotificationAssistantPickerTest"