Merge "floss: Keep uhid when wake-allowed hid is bonded to fix wakeup" into...

Merge "floss: Keep uhid when wake-allowed hid is bonded to fix wakeup" into main am: e7a0e357 am: c8e5e571

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



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