Merge "Fix flaky test: testSetOemNetworkPreferenceForTestPref" am: 4402d99296

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065429

Change-Id: I336ff1884e85ad2978d431f7d44d6d7d1eccf729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>