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

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

Change-Id: Ibe58162cea08deff5c0d0db375714b7daadc7ca8