[automerger skipped] Ensure external calls are ended on the headset. am: e5416a8a -s ours

am skip reason: Merged-In Ibfa9706281d6054c7ffd6fcc41d75729733035ed with SHA-1 85bfc16c is already in history

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



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