Merge "TvInputHardwareManager: always try patch recreate if null" am: 59349e6d71 am: f69aecc91a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e5fcf5450c4fd5b217612e30e72448171035d53