Merge "Add NR bands to service state." am: ff4f8d0f3c

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

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