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: ac38ade9

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



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