Merge "Merge "Use STREAM_VOICE_CALL when device connected to le BT device or...

Merge "Merge "Use STREAM_VOICE_CALL when device connected to le BT device or hearing aid device to play tones get from ToneGenerator." into tm-dev am: e30ea069 am: e6eea9fa am: b22261bd" into tm-qpr-dev-plus-aosp am: 1e20b2ae

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



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