* commit 'e32b2d32d7e4a492bb3038c7bc55988a908437a4': Revert "Revert "Add physical TV input handling to TvInputManagerService""
* commit 'e32b2d32d7e4a492bb3038c7bc55988a908437a4': Revert "Revert "Add physical TV input handling to TvInputManagerService""