Merge "Fix permission error of binding to TvInputService" am: e1215118ac am: 37c7128618

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

Change-Id: I140d08f04861a25868320a26f5887ad11f107bdd