[automerger skipped] Merge "Fix DisplayState sanitization." into udc-qpr-dev am: 3891629b -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/+/28466754



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