[automerger skipped] Merge "Cleanup the public API getActiveNetworkForUid on AOSP" am: 06c19fa5d4 am: a8b2994fc9 -s ours
am skip reason: Merged-In Ie93cd22b11cc28135a385c0cf6ad6b577b61d1b7 with SHA-1 8697a083a8 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1749660
Change-Id: I6863c7badf8b520a08ccd42be77822fd2fdc8a4e
This commit is contained in: