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

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

Change-Id: Ie2c6d8b48c2652e0883d728d33039cb3b131f2cc