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

Change-Id: I5bdac4568dd83d3de578603ddd37fc4dc4535c32