[automerger skipped] Merge "Remove redundant <Give OSD name> for TV devices" into main am: 46d14dde18 am: f5fa523696 am: bdcaac71da -s ours

am skip reason: Merged-In Ide00d75807d9456ba46576f91ebf6d0ecaf4f931 with SHA-1 1e3b036412 is already in history

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

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