Merge "Fix the ongoing call chip animation" into tm-qpr-dev am: e5607e3b am: a5f3354c

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



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