[automerger skipped] Merge "Do not power off display on lockNow() on...

[automerger skipped] Merge "Do not power off display on lockNow() on automotive builds." into rvc-qpr-dev am: cad8a4f5 am: a26bcb66 -s ours

am skip reason: Change-Id I410e06b911b099c0ed4b7b4e3ac493c9a272fa6b with SHA-1 fc586009 is in history

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

Change-Id: Ie367400252f881b022779a9895b3ffefbd7ab70e