Merge "Fix array-parameter warning" am: 66808f0c5e am: aef9d80cfd

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

Change-Id: Id18b348f913eb002c101f0c4472ee5d0d2372201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>