Revert "Fix DisplayState sanitization." am: 37b340fe19

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

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