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

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

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