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

Change-Id: Ib70696d6a11d9054a5ad6a6241809cfc7ba97908