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

Change-Id: I84377e882c77b16862b1e049c54e36dc94c78883