Revert "Fix DisplayState sanitization."

This reverts commit 4e8200dec484fd6e5873f2a89c0b314467034eef.

Reason for revert: b/352098820

Change-Id: I4c421170d8788891d4b2304ee658d4b666bd9bc5
Merged-In: Ie505ebeda960412e79327fddc8ac7c6d3900727d
9 files changed