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

Merge "Merge "Avoid unexpected screen off during perf testing" into rvc-dev am: 92b6167f am: 3c0a0fe8" into rvc-d1-dev-plus-aosp am: 1c294783

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

Change-Id: I5aaec355b956e5d30ba1f0c085839fa1ee89b8c9