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

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

Change-Id: Ie6b4245a817eb3f8ab0870491ed43d489d72b8a8