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

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

Change-Id: I075cbaa5c2f99ce7611adde5560f86d3029765ed