Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am: d30e47ec am: 849805b8 am: 45f17f45"" into oc-mr1-dev-plus-aosp