Merge "Floss: Allow disabling one of HIDP or HOGP in EP" am: a009a668 am:...

Merge "Floss: Allow disabling one of HIDP or HOGP in EP" am: a009a668 am: a974abed am: e78058d5

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



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