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

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

Change-Id: I9db92539f260c7717ff01c8d5a1eb24c4fa4ff7f