Merge "Cleanup the public API getActiveNetworkForUid on AOSP"