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

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

Change-Id: Ib814d81bcabd0aac3231bd622583f76fdc7b2465