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

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

Change-Id: Ibb77f38a5dc9603c02e5e5b0a4d8f917bfc7863a