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

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

Change-Id: I802f384b59cddaa10a07934dcbb7990a8d30342d