Merge "Bluetooth HID Device: Fix a typo" am: d30e47ecfc
am: 849805b804

Change-Id: I17a5fd3eac7366f8e721419cafea6e79c98b50c5