Merge "Additional MediaRouter2Info wired route types" into main