Merge "[Telephony mainline] Move #dataStateToString and #getNetworkTypeName to calling location" am: ace1a650 am: 9359013f Change-Id: I188afccf3da545a9cc68d03c1d22706d11237ee2