Merge "Cleanup error messages from HidlInstrumentor."
am: 54e74058d8

Change-Id: I80f7558c3c49ebf4026b48215d71ec61121cc19c