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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56c9430774d38e7d267da29488b856c635afe496