[automerger skipped] Merge "Cleanup the public API getActiveNetworkForUid on AOSP" am: 588a92abe4 am: 806baad21b -s ours

am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

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

Change-Id: I6fdaa0c679437cdeb7de3c0052615faa647e3801