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

Bug: 203074066
Test: Verified on device
Change-Id: Ib40bb575796d077d7fcf89d510087e4fcb0bc00b
10 files changed