Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am: d30e47ecfc am: 849805b804 am: 45f17f4533"" into oc-mr1-dev-plus-aosp
am: df85294d73  -s ours

Change-Id: I6af8436be7910fe6760d1f1cfaed8cfba3909129