Merge "Publish Bluetooth HID Device Profile Service API" am: fbd4ea125f am: 6047c90e9b
am: cab953250f  -s ours

Change-Id: I8c798b9a2852493a0efff555036c97ebfd2eb3dd