Merge "Kibosh the NrState Strings" am: 7e42554a0a am: 959570eb57 am: 0009280c26 am: 6359b5a655

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

Change-Id: Ia99bd29f89e67f8bdd53ffa4039a0e02e8d08b38