Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am: d30e47ecfc am: 849805b804"" into oc-dr1-dev-plus-aosp