Merge "Fix testSetOemNetworkPreferenceForTestOnlyPref flaky" into main