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

Change-Id: I7ee44e6d952c5d9760e04572d2009fe107aad80b