Merge "Use default dsu slot name when host is Android Q"