Merge "Fix logging for HID host and device service"
am: e31211949a

Change-Id: I7c51e66243a385f5caa0a148ca533cbca3884f18