Merge "TvInputManagerService patch" am: 11e60c0824 am: 2891b74ac3
am: d710ca399a

Change-Id: Ie113645bb83463d3dd0c12d71cf4a6a3ed8da42a