Merge "Add NR bands to service state." into tm-qpr-dev am: 10b52f3486

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

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