Merge "Fix cert-dcl16-c warnings" am: 2d028894c7 am: 2f22222a1c am: e18edd3ffd

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1978297

Change-Id: I325ae168dc1735f69813c08072dfb9d1e8d1c2a5