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

[automerger skipped] Merge "Revert "Add NR bands to service state."" am: 6e64c643 am: e76a93d7 am: 76ad14d5 am: ae8dcf78 am: 7baa0854 -s ours

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

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2124257

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



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