Merge "Revert "Add NR bands to service state."" am: 6e64c643cf am: e76a93d7af

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2125054

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