Fix DisplayState sanitization. am: 4e8200dec4

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

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