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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315830

Change-Id: I7edf1f77e47b10bd850a56a7d6ab6bcd594b3bc5