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

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



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