Merge "InCallTonePlayer concurrency improvements." into tm-dev am: 6a8a915d8a am: 4c56b899c3 am: 8ce455e807

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

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