[automerger skipped] Merge "[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: 4e732abc0b" into tm-qpr-dev-plus-aosp am: a7b110ff51 -s ours

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

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

Change-Id: I20c26a74631f98f12534ffdb49141ab4c123a8b6
Signed-off-by: Automerger Merge Worker <[email protected]>