Merge "Leanback tests: Fixed two test failures due to API changes" into nyc-dev
am: b766c02c39

* commit 'b766c02c39e18ba6fc855f68eac69c5917d1a177':
  Leanback tests: Fixed two test failures due to API changes

Change-Id: I3be7bf25bbff3a2ad5039fff441852998a58e258