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