DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when...

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected am: de900861

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



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