Merge "Enable plug in chip animation for teamfood" into tm-qpr-dev am: d79d644a am: 52b35f12

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



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