Merge "Indicate that NR NSA fields are NSA only" into tm-dev am: 0e8401641a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/17128230

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