Revert "Fix DisplayState sanitization."

This reverts commit 4e8200dec484fd6e5873f2a89c0b314467034eef.

Reason for revert: b/352098820
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:37b340fe19fa66c730ea8733f4db65457a4f9f68)
Merged-In: I4c421170d8788891d4b2304ee658d4b666bd9bc5
Change-Id: I4c421170d8788891d4b2304ee658d4b666bd9bc5
9 files changed