[automerger skipped] Merge "Fix device config property change for refresh rate...

[automerger skipped] Merge "Fix device config property change for refresh rate in low and high zone is read incorrectly" into tm-qpr-dev am: 01ce329a -s ours am: 9fc7afab -s ours

am skip reason: Merged-In I72f6c5c2d746bdd85fcf1be4e95d1529084046f3 with SHA-1 d184f2f1 is already in history

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



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