Merge "HID Device role API fixes" am: f33a71d017 am: a7d58fecc6
am: 8e2e2b1381

Change-Id: I9e35c73f1a6094ddae892758d81955490aaa5f92