Merge "Fix test breakage in HidHostServiceTest"
am: 85bcf82a31

Change-Id: I2a54e198a72365574de28e6e89084278fd263b03