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

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

Change-Id: Ia3fc57e42b5433f6ccbc3841877d46a0c420ea2c