Merge "Fix the issue where resetting the refresh rates in DeviceConfig...

Merge "Fix the issue where resetting the refresh rates in DeviceConfig wouldn't make the system to fallback to the default values" into udc-dev am: 27558598 am: 3abbe0be

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



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