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

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



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