Merge "Added tests to verify values loaded from display configs are correct"...

Merge "Added tests to verify values loaded from display configs are correct" into tm-qpr-dev am: 5fa422b9

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



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