Merge "[automerger skipped] Merge "Cleanup the public API...

Merge "[automerger skipped] Merge "Cleanup the public API getActiveNetworkForUid on AOSP" am: 06c19fa5 am: a8b2994f -s ours" into sc-dev-plus-aosp am: 19d649e5 -s ours am: fe223c59 -s ours

am skip reason: Merged-In Ie93cd22b11cc28135a385c0cf6ad6b577b61d1b7 with SHA-1 8697a083 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1749660

Change-Id: Ifeb82f4c3489efc7a7c3afa39cf7531a322f49bf