DO NOT MERGE: Fix leanback Test Build

Test: modified and verified
Bug: 31747764

Change-Id: I0b08161f3910bda870e13528afd8a765529f611c
2 files changed