[automerger skipped] Merge "Revert "BluetoothInCallService: Wait for...

[automerger skipped] Merge "Revert "BluetoothInCallService: Wait for disconnect tone at onCallRemoved"" am: 16f37d8e am: 2d82d1a2 -s ours

am skip reason: Merged-In I3171902ff020bcd348cab407f2f07d713ace4a99 with SHA-1 352ef2a0 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2097099



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