Merge "Fix WifiCallingSettingsForSubTest" into main