Merge "Merge "TelephonyDisplayInfo use PS WWAN NRI for data network type" into...

Merge "Merge "TelephonyDisplayInfo use PS WWAN NRI for data network type" into tm-dev am: 586953da am: 92700f85" into tm-d1-dev-plus-aosp am: a9d53ac7 am: 6ae9af4b

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



Change-Id: I930cbe71e878e784b5eb02a1b4e28ce20435c80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>