DO NOT MERGE: Downbranch merge conflict [Output Switcher] Add animation when init connected am: de900861e9 am: 7df087c3d7 am: 807fc3a62e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17859795 Change-Id: Ibaf7c4c4ca0266ace48e0bdfaa772b8eef4734fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: