Merge "Add UserHandle to MediaRouterService#showMediaOutputSwitcher" into main