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

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

Change-Id: Iba29c8868fc8e682b20cd22a9fa476f9bae1648f