Merge "Kibosh the NrState Strings" am: 7e42554a0a am: 959570eb57

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

Change-Id: I151e67a230baa260e9e209a3de0757eda51be728