[automerger skipped] Merge "Fixed the build break in cf_x86_tv-userdebug" am: 1cef9f31ab am: 0d8cfadce2 am: 9ed8743249 -s ours

am skip reason: Merged-In I4832e2890ea561c8ad377e5a62bfa22dae35bf0f with SHA-1 2bbf8ee86d is already in history

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

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