Merge "Enable HID Device Profile Service (2/2)"
am: 7e3fbd59d1

Change-Id: I993b08e37f0ebcc7bca0b2b536348c41dd548861