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

am skip reason: Change-Id I74e4155eed8692071a54649333becbac06d8a11c with SHA-1 d103646f76 is in history

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

Change-Id: I84e450eb31a61f9fefc853d2cf802ba7c34c1c52