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

[automerger skipped] Merge "Add NR bands to service state." am: 47ecbaf0 am: 73d96f6e am: 7c677de9 am: 1a7acd4d am: e0239d74 -s ours

am skip reason: Merged-In I25ec415e603208cb857c912d3aa3c7e1900613b3 with SHA-1 f36f846d is already in history

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



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