Merge "Restore presubmit of testSetOemNetworkPreferenceForTestOnlyPref" into main