[conflict] Merge "Fix the issue where resetting the refresh rates and...

[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

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



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