Merge "Run tv input framework feature for the TvContractTest" into nyc-dev am: 895e2e6fab am: fb9aba3d1c am: 89f2f2683c am: bd4ae2d77d am: f9cc8227a6
am: 46ce09bfec

Change-Id: I1e207711468c1d8688b1d6e313e3a908d7e8ddc0