[automerger skipped] Fix DisplayState sanitization. am: 9c7a1f54 -s ours

am skip reason: Merged-In I500ff9a5bd356845e2d0be4d1430448f448c4e8a with SHA-1 b6ddf525 is already in history

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



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