Merge "Refine SystemUI plugin and animation deps" into tm-qpr-dev am: 6c1d781c am: ec9ce94d

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



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