Merge "[Telephony mainline] Move #dataStateToString and #getNetworkTypeName to calling location"
am: ace1a65025

Change-Id: I7f6d78b27f8a2460f4e97e12b51d1aac6e3cc2b0