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

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

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