Merge "Revert "Expose NetworkRegistrationInfo.getNrState() as public API""