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 am: 8cea8e4b

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



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