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

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

Change-Id: Ia6c9856c0e35ad4badcf0ba2c109f1ae8648c685