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 am: 9323eb5f

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



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