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

Change-Id: Ie7510611b3fed966e4e4cc57b8fed91610a8bc1d