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

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

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

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