[automerger skipped] Merge "[Ongoing Call] Remove the call chip when...

[automerger skipped] Merge "[Ongoing Call] Remove the call chip when #onEntryCleanUp is called." into sc-qpr1-dev am: 16517d73 -s ours am: 7cf888ba -s ours am: 1ad56955 -s ours

am skip reason: Merged-In I0f681ccfe55597490bee0d4b190f9fb2c38e28f2 with SHA-1 cd755525 is already in history

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

Change-Id: I2e83f417e609f78737684d615ca115f0467b3a2d