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

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

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



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