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

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

Change-Id: I82333867c1c68fd27e19c20d62e00119c8919fc7