Merge "[Output Switcher] add check on animation" into tm-dev am: 81a014f0

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



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