Merge "Fix flaky test: testMobileDataPreferredUids" am: b063daea6d am: 04768129ec am: 1c7af8b0a7 am: c49ae29f86

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

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