Merge "SystemServer: fix an infinite loop in TvInputManagerService [1/1]" am: deb1024b75 am: 839fca8ad5

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

Change-Id: Idcd8114385be347e2f111d836200cf1f81f51ebd