Merge "Fix issue of TvInputManagerService not binding to TvInput services in Kids" into sc-dev