Merge "Skip screen animation if it is off" into udc-dev am: 61f4503d am: e1121582

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



Change-Id: I8e84270647a9e2eeaa7f88937af4a316f8f4417e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>