[automerger skipped] Revert "Fix DisplayState sanitization." am: f460b8bf -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/+/28364464



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