[automerger skipped] Merge "Indicate that NR NSA fields are NSA only" am: 07eac89a5a am: a341302e72 -s ours

am skip reason: Merged-In Ie5e39ce73ab17c4e459f58cee22f2808f95609ec with SHA-1 e25665320f is already in history

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

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