[automerger skipped] Merge "Revert "Add NR bands to service state."" am:...

[automerger skipped] Merge "Revert "Add NR bands to service state."" am: 62d0367b am: da9d04eb am: fba318ec am: 03262eae am: 57154d12 -s ours

am skip reason: Merged-In I493e574e588da17dc8cd26e3cc04498775cbaeff with SHA-1 c1fe8a12 is already in history. Merged-In was found from reverted change.

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

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



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