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

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

Change-Id: Ib74720db3b676e22d8a7f9d6f9aaaeb10de0b69d