Merge "Kibosh the NrState Strings" am: 7e42554a0a

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

Change-Id: I950efd1d513b0f5eb723e85e7c9e9428a6623677