Merge "Revert "Partially enforce permission when calling getNetworkInfoForUid""