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

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



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