[automerger skipped] Adds back hasFlag check for DeviceState toString method am: 62747e4d2b -s ours

am skip reason: Merged-In Iadeb933fb5e5be1ef255fb2ca9fcc69c12147d7d with SHA-1 eb84df6c1a is already in history

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

Change-Id: I1dc02b032ee24edfa6771549d53b5b6178653bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>