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

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

Change-Id: I735d0a9f78ce79b773fdf2c67c0a069471713e2a