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

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

Change-Id: Ie4107b15587e65378583eec07e038b977cb2ca54