Merge "Fix hardware TvInputService binding issue" am: e27b9897c3

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

Change-Id: Ib0cf238baa3278cfc70c50a4059788ae9f9da3de