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

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

Change-Id: I3f202dcca0c638f341aee705612bcd6d468fc39f