Merge "Fix testSetOemNetworkPreferenceForTestOnlyPref flaky" into main am: 3a8ed26686

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

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