[automerger skipped] Merge 10952656 am: 2c84071cec -s ours

am skip reason: Merged-In I7dd3e12e549228223ed8c8aac71e6d1faf94f487 with SHA-1 4cfb32a63e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TvSettings/+/25093162

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