Merge "V4L2EncodeComponent: fix build error am: 3db9508b am: 15c4e662"...

Merge "V4L2EncodeComponent: fix build error am: 3db9508b am: 15c4e662" into tm-d1-dev-plus-aosp am: f190b2ef

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/19033643



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