Merge "Create Central Version of dataStateToString()" am: 8abad0504e am: c421bfbbb3 am: cebf61cc60

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

Change-Id: I95fff63c457811428121188838ccbe2396ca068d