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

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

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