Merge "TvInputManagerService: Suppress warning in dump() and fix typo"