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

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

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



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