[automerger skipped] Merge "Add more unit tests for mobile data preferred uids feature" am: c6741064d0 am: c639d88a44 -s ours

am skip reason: Merged-In I63f65bffc1b8883ddfd774222e26e629d7ea1f94 with SHA-1 7ed70a944c is already in history

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

Change-Id: Ib3deeef2f0aa478299ffa8b8fd9355c861946de9