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

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

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