[automerger skipped] Revert "Fix DisplayState sanitization." am: 37b340fe19 am: b4bf96a437 -s ours am: a8b4eda943 -s ours

am skip reason: Merged-In I500ff9a5bd356845e2d0be4d1430448f448c4e8a with SHA-1 9c7a1f541f is already in history. Merged-In was found from reverted change.

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

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