[automerger skipped] Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo" into sc-dev am: 374ae167e1
-s ours
am skip reason: Change-Id Ib95f6a012c0f725335f46e17b8414005a76ad5c9 with SHA-1 961c3184cf
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13515168
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifde28a03440f70995f871018267b144ea31fdf76
This commit is contained in: