Merge "Merge "Avoid unexpected screen off during perf testing" into rvc-dev am: 92b6167f am: 6474cf02 am: b2a46806" into rvc-qpr-dev-plus-aosp am: c7bd746c

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

Change-Id: I36975fb71cc6fadb1aef28757becfe1a1d8fb2b4