Merge "Fix flaky test: testMobileDataPreferredUids" am: b063daea6d

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

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