Merge "Add test for new exposed getNrState API" am: 2c2f2b635d am: 67889e697b am: 9808a4577a am: 42910f805b

Original change: https://android-review.googlesource.com/c/platform/cts/+/1471542

Change-Id: I1fce2cdfc6aaa67e70e372fc1f7e86f8d0e4fcc2