Merge "Fix build break for camera.v4l2_test" into main am: da7cdc6943 am: 085358d406

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/3254292

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