[automerger skipped] Merge "Add thermal options for refresh rate blocking...

[automerger skipped] Merge "Add thermal options for refresh rate blocking zones." into udc-qpr-dev am: ff7388c6 am: 00b34e38 -s ours

am skip reason: Merged-In Iad1d3b7786a019f68dea3d0820fe587cb36c8a1d with SHA-1 8890bf7f is already in history

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



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