Merge "Save display persistent data store" into sc-dev am: 6a295360

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

Change-Id: Id45b8ebbb0c2848da712b1c18c2035537e3a8ef7