[automerger skipped] Merge "Adds back hasFlag check for DeviceState toString method" into 24D1-dev am: dd6a086429 -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: Ib9ab5aee2033b80a0afa9d56f88e3b368f353352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>