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

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

Change-Id: I02ec3239c017d2623e5576e63a744961fc2b7adb