Merge "Expose ServiceState#getDataNetworkType in telephony provider" am: 9446a5239f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639370

Change-Id: I15577030238d4e210f1a4f1f31abd937af4adf65