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

[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected" into tm-dev am: abe29d73 am: c60c54de am: 3538ba1b am: 41b897f1 -s ours

am skip reason: subject contains skip directive

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



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