Merge "TvInputManagerService patch" am: 11e60c0824 am: 2891b74ac3 am: d710ca399a am: d066d5b7fc
am: 99d3e083e6

Change-Id: Ifa0a11d6d40a79d02dd73a2cf7e4df954f5b96b3