Merge "Add thermal options for refresh rate blocking zones." into udc-qpr-dev am: ff7388c6

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



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