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

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

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