Merge "Fix hardware TvInputService binding issue" am: e27b9897c3 am: f71ccd329a

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

Change-Id: I3aff7ec77bc4d7bc29453ceabee58de6f949b59b