[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: de3ce41f -s ours

am skip reason: Change-Id I242e8499a1bb31dcb5a3f0fbae2f8423c8c8f8a0 with SHA-1 1f8e5f0f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b86ea7e58e35a1bd9e0f4dc30cdedffe00ad811