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

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: 4e732abc" into tm-qpr-dev-plus-aosp