[automerger skipped] Merge "[Ongoing Call] Remove the call chip when #onEntryCleanUp is called." into sc-qpr1-dev am: 16517d739d -s ours am: 7cf888bac5 -s ours
am skip reason: Merged-In I0f681ccfe55597490bee0d4b190f9fb2c38e28f2 with SHA-1 cd755525c4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15923991
Change-Id: I8a4fd938acf2ffb76517b735d0607b7eeff567a6
This commit is contained in: