Merge "[Telephony] getDataNetworkType() uses incorrect subid" am: 7e9c93dc7c

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

Change-Id: I4d25a6b356fb095f5cb264abcbabf598c6b3f6bf