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

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

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