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