Merge "[DP]Remove the usage of hidden API getNetworkInfoForUid"