Merge "HidlInstrumentor - fix w/ Wpadded" am: 951417092a am: b8a0af5f90 am: 8d99411d54

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1557027

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b3ebc88eb0f279ba4bef2e254ba5fad526f81a2