Merge "Do not fallback HFP active device to watches" am: a242bcc8 am: f9a81851

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



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