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

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



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