Merge "VTS workaround for RadioSimTest#setAllowedCarriers" into main