Merge "Expose ServiceState#getDataNetworkType in telephony provider" am: 4e55d41fe4

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1638245

Change-Id: I3ade1687d7e251c67b7213323d1e2db0605a80ec