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

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

Change-Id: I130ac09eabed2e2de4187552e3f1f83082755451