Merge "Ensure external calls are ended on the headset." am: 05440d82 am:...

Merge "Ensure external calls are ended on the headset." am: 05440d82 am: 06fd5298 am: e7c04fb1 am: e6a18c06

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



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