Merge "Revert "Expose NetworkRegistrationInfo.getNrState() as public API"" am: 237d2d47a4 am: cc717d3cf9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68e07cb3f7d369073d4b05433e1c746bc9277095