Merge "Update NR info using the most recent ServiceState" into udc-qpr-dev am: a72690594e am: dba92c0f0e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/23774843

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