Merge "SystemServer: fix an infinite loop in TvInputManagerService [1/1]"