Merge "[Ongoing Call Chip] Remove the chip when an ongoing call notification is updated to a non-ongoing call notification." into sc-dev am: 168ba65337

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

Change-Id: I863f734884533ed24182733f8ca319509e67815b