Merge "Disable HOGP only if it was previously enabled" am: d1860e21 am:...

Merge "Disable HOGP only if it was previously enabled" am: d1860e21 am: 71638082 am: 221dea68 am: 36f3ee7d am: 6ada198c

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



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