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

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

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



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