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

Change-Id: I56c59fe06a753784a965f47dd0b9ff58d472b808