Merge "Fix reference leak on TvInputManagerService"
am: 3fe37342ed

Change-Id: I62b235faad8b9ec2236159ac6baaee6adc4d6fa2