Merge "TvInput HAL uses "default" service name"