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: I7b29d7ad64f3faa388c0f0734f5a9a0336d235a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>