[automerger skipped] Merge redfin/bramble support. am: b7335cec9b -s ours

am skip reason: Change-Id Id8452035c2bf12de3c13dfebb02a6bd91889b9a0 with SHA-1 ad3bbf3f62 is in history

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

Change-Id: If7e401a9acecb9d78dfe191da09a75ccbfcd17bb