Merge "Fixed the build break in cf_x86_tv-userdebug" am: 1cef9f31ab am: 0d8cfadce2

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

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