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 am: 35cb05a8

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



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