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

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

Change-Id: I396f3eb0440dafe3aa356e412d8a259206cc74f9