Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" am: e431ce4aef

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1730671

Change-Id: Ife9c588798034e05967b3e0eeef28fdb6a24e1e5