[automerger skipped] Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for...

[automerger skipped] Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev am: 536c1c50 -s ours

am skip reason: Change-Id I45b12502d5d628cd94fe13351640d39b96a1c25f with SHA-1 55cfcae6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89133f619c2db394918e42d4e24d9da4dd17ed30