Merge "Fix the tones playing count in InCallTonePlayer" am: 3fa4d5b0 am:...

Merge "Fix the tones playing count in InCallTonePlayer" am: 3fa4d5b0 am: 81e075b9 am: 57e0c60f

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



Change-Id: I76f6546100b64c2d0206cc04427bc4e012c8b0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>