[automerger skipped] Fix DisplayState sanitization. am: 8e2ca264 am: 0c0a920a -s ours

am skip reason: Merged-In I7d227dedaa13a1a31ebf9ace073c792287f35305 with SHA-1 f65da8a9 is already in history

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



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