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

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



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