Merge "Disable blurs during critical thermal state" into sc-dev am: 12740585ed am: 267b223c58

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

Change-Id: I105e5c5dcfed5810c95532c0ada3500da13901b6