Merge "Disable screen off animation in situations where it currently looks...

Merge "Disable screen off animation in situations where it currently looks bad." into sc-dev am: f3dd83db am: 2cbe825c am: 01203799

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

Change-Id: I41423b4ed341305f51ed1443648287677506b9d7