Fix DisplayState sanitization. am: 8e2ca26478

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

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