Merge "Fix issue where InCallTonePlayer could fail to stop ringback." into tm-dev am: 0c3e45d6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/17897950



Change-Id: I4a5a2db8c480ff0e6f06dcb5e0ba50de80d25908
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>