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

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

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



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