Merge "Revert "Add physical TV input handling to TvInputManagerService""