Merge "Do not power off display on lockNow() on automotive builds." into rvc-qpr-dev am: cad8a4f55e

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

Change-Id: I2eae34c713b8ebc41e7332eca7a89f594da84c59