Merge "TvInputManagerService patch"
am: 11e60c0824

Change-Id: I32d0deab39df9a1ec2a2aaa012fccca307053db2