[automerger skipped] Revert "Fix DisplayState sanitization." am: 37b340fe am: 1e55c074 -s ours

am skip reason: Merged-In Ie505ebeda960412e79327fddc8ac7c6d3900727d with SHA-1 b3daf1a1 is already in history

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



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