Merge "Revert "Adding the missing display mode strings to...

Merge "Revert "Adding the missing display mode strings to persistentDataStore"" into tm-qpr-dev am: bc62749f am: 6be0d9f8

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



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