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: b2a46806

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

Change-Id: I15fe73ad69bde7c9820dec2d2716198fbf79417d