Fix DisplayState sanitization.

Bug: 347307756
Flag: EXEMPT bugfix
Test: CredentialsTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f65da8a9d7b6869dc2ad5cdd3b48763b8e18ac46)
Merged-In: I7d227dedaa13a1a31ebf9ace073c792287f35305
Change-Id: I7d227dedaa13a1a31ebf9ace073c792287f35305
8 files changed