Merge "Remove redundant <Give OSD name> for TV devices" into main am: 46d14dde

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



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