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

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



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