Merge "Revert "Add NR bands to service state."" am: 62d0367b am: da9d04eb...

Merge "Revert "Add NR bands to service state."" am: 62d0367b am: da9d04eb am: fba318ec am: 03262eae

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



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