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

Change-Id: Ie545fb4737a79c7c2b35a4238d75d17435efa6f9