Merge "Avoid unexpected screen off during perf testing" into rvc-dev am:...

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

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

Change-Id: I64eb7e87c3e579d469f8c60e6a395905175e97dc