Merge "ITvInputManagerCallback leak when client died" into main am: 91f912fe96

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

Change-Id: I0fdf555961d3aad1d269ebfbdc2762e3e801799a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>