[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected am: de900861 am: 7df087c3 am: 807fc3a6 am: 3bc8ab18 -s ours

am skip reason: subject contains skip directive

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



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