Merge "Expose HidlInstrumentor data." am: 1ba6751d20 am: 4617ff619c
am: 169dd11944

Change-Id: I8d27d9a15fa144279d57bd713f1a7e1d5893e4e3