[automerger skipped] [conflict] Merge "Fix the issue where resetting the...

[automerger skipped] [conflict] Merge "Fix the issue where resetting the refresh rates and brightness thresholds in DeviceConfig wouldn't make the system to fallback to the default values" into tm-qpr-dev am: 4e732abc am: 52caaf70 -s ours

am skip reason: Merged-In I700d8581975fe6ac0c0db4ec800f3698ffa0c2d1 with SHA-1 c972d73d is already in history

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



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