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