[automerger skipped] Merge "Add N/A for NR SA in RadioInfo" am: 8c59c022fa am: 87dc21efae am: 23b6eeb0f6 am: 9645fa2b35 -s ours

am skip reason: Merged-In I8b8cca800f2d7492cbc3f572733673064dfc7668 with SHA-1 e70e4d5ac8 is already in history

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

Change-Id: Ifcc596a2d2a3e4a082dd9ec9cd2aba5b458ee8bb