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
am: 2f09f42267  -s ours

Change-Id: I54b318ac62db69258995b1cf62d21529e875ad2f