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

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

Change-Id: I155dbd1381ab6d0388da5fb6a3f66fd0cf9f906a