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

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

Change-Id: Ia4177dae1104cc67ec8e0a1bf9d8765291afec1f