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