Merge "Don't use @hide API - ConnectivityManager#getNetworkTypeName()" am: 15c869f6ad am: d8cb139d7c am: 9eddbf8e3f am: acec167bd7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495900

Change-Id: I2455af16e50ef10335614c49ae53900d2846b1db