Merge "Remove usage of hidden API TelephonyManager.getNetworkTypeName(int)"