Merge "[Ongoing Call] Remove the call chip when #onEntryCleanUp is called." into sc-v2-dev am: 8649b294c1

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

Change-Id: I1a449b497ebe6c2d38aa6d029e63ff564a79a454