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

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

Change-Id: Ib547b888721297104b2652ef791404f439d7b301