Merge "Avoid unexpected screen off during perf testing" into rvc-dev am: 92b6167f am: 6474cf02

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

Change-Id: I7b85128ab1291c79cd8a92988e2cf2511e77ef70