Merge "Cleanup the public API getActiveNetworkForUid on AOSP" am: 588a92abe4

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

Change-Id: I74f0e25208fa797e2953752a4b41cf5eec872136