Merge "Improved the network type to string" into tm-dev am: 0488b34b am: 29f744ac

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



Change-Id: I90ea3e82b2c6af162b420a467161dd4d3b71290c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>