Merge "Fix flaky test: testMobileDataPreferredUids" am: b063daea6d am: 04768129ec

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

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