Revert "Fix DisplayState sanitization." This reverts commit b6ddf525be3c2abbde59ae1533494b18a7961087. Reason for revert: b/352098820 Change-Id: Ie505ebeda960412e79327fddc8ac7c6d3900727d