[automerger skipped] Merge "Propogate NR technology through telephony layer"...

[automerger skipped] Merge "Propogate NR technology through telephony layer" am: 3246b4f4 am: 9ad8aba4 am: 0aa43e42 -s ours am: 7ded0192 -s ours am: 8b450402 -s ours am: 6a2492a0 -s ours

am skip reason: Merged-In I8be1d52c7f26911a32db38e3556b07db997712ab with SHA-1 81dd2f76 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1700245

Change-Id: Ie609c1e1bed43ffeb5a2a982d185894bd392afda