[automerger skipped] Merge "Create Central Version of dataStateToString()" am:...

[automerger skipped] Merge "Create Central Version of dataStateToString()" am: 8abad050 am: c421bfbb am: cebf61cc am: c8716e07 am: bcd38eeb -s ours

am skip reason: Change-Id I36945a8a432f7b4f0c449f7414996372e852b5b8 with SHA-1 b640b1c6 is in history

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

Change-Id: I918a4d4d0ed5609c8ae1c9c0da50eb82fdf9e2b7