Merge "Fix testSetOemNetworkPreferenceForTestPref flake" into main am: 8454fb5fed

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

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