[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher]...

[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected am: de900861 am: 7df087c3 am: 1057159b am: 235dc4ac -s ours

am skip reason: subject contains skip directive

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



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