Merge "Fix "ActivityTaskManager.requestAssistDataForTask crash on secondary user"" into main