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

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

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