Merge "Indicate that NR NSA fields are NSA only" am: 07eac89a5a

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

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