Merge "Merge "[Ongoing Call Chip] Call Chronometer#stop to prevent leaks." into sc-dev am: 8a57c76a am: a08366a1" into sc-v2-dev-plus-aosp am: 1ed0a984

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

Change-Id: I7046f22488381044149847f1c989eed24da2f516