[automerger skipped] Merge "Revert "Fix DisplayState sanitization."" into...

[automerger skipped] Merge "Revert "Fix DisplayState sanitization."" into udc-qpr-dev am: cc2c13f2 -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: I915428ec75faea7d04bc5810b5ddb704481455b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>