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

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

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