Merge "Fix flaky test: testSetOemNetworkPreferenceForTestPref"