Merge "Fix testSetOemNetworkPreferenceForTestPref flake" into main