Merge "Expose NetworkRegistrationInfo.getNrState() as public API" am: f177ac1348 am: b637605947

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

Change-Id: Ib6f1a78fc0c0bbe67f5f410ae3c71c935494b25c