Merge "TelephonyDisplayInfo use PS WWAN NRI for data network type" into tm-dev am: 586953da

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



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