Merge "Don't use @hide API - ConnectivityManager#getNetworkTypeName()"