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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I122d5e6f6f7e0c1334528825e8f3e24148c4c00e