Merge "Allow HID Device to connect to a specific device" am: 0c45c105a5
am: 176b7ce269

Change-Id: I5436a00ae735089f712ec4dabfee5ef90f83a637