Merge "Fix issue of TvInputManagerService not binding to TvInput services in Kids" into sc-dev am: afd8e9bb am: 0977fd36 am: d41fb2fb

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

Change-Id: I873023254e192d3441a254c33a8a6bfb868b22eb