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

Change-Id: Ic3272abcbd5944818e6d3b93d08dfee2bc44e84d