[automerger skipped] Merge "Do not fallback HFP active device to watches" into...

[automerger skipped] Merge "Do not fallback HFP active device to watches" into tm-qpr-dev am: a4efbba0 -s ours

am skip reason: Merged-In I3fa1364c09674c1b6b817c783d4d1e2ecbca901a with SHA-1 af8f7d30 is already in history

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



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