Merge "Ignore-AOSP-First: Revert "BluetoothInCallService: Wait for disconnect...

Merge "Ignore-AOSP-First: Revert "BluetoothInCallService: Wait for disconnect tone at onCallRemoved"" into tm-dev am: 73e42c70

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



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