[automerger skipped] Fix DisplayState sanitization. am: 4e8200dec4 am: a350e9e9fb -s ours

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

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

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