[automerger skipped] Merge "Get data network type from NetworkRegistrationInfo...

[automerger skipped] Merge "Get data network type from NetworkRegistrationInfo instead of ServiceState" am: b65fa518 am: bb12b915 -s ours am: c4bc6ce7 -s ours

am skip reason: Change-Id Ic49097543a6d6c19cc8e8e9fa9406ca1d17f7cad with SHA-1 6d7c9b76 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1595293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I194676b976ea1bb0fd99321dc49d8f81914148d8