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

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



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