Merge "Fix hardware TvInputService binding issue" am: e27b9897c3 am: f71ccd329a am: 5cd05e3d40 am: b159aa066b

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

Change-Id: Ic9c4598640e18020507d1d3e17224e34a74490cd