[automerger skipped] Merge "Implement mobile data preferred uids feature" am: 0a0d7c99c9 am: f22f80f3b1 -s ours am: 983b2852c0 -s ours
am skip reason: Merged-In I5153c770650594e05dfa8cf230d7381d790f4a55 with SHA-1 71ad4f1175 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1716396
Change-Id: I4224f84c3c0dc38f69220df54c00623ef465ec4a
This commit is contained in: