[automerger skipped] Merge Android R am: aca6097e51 -s ours am: fa8c4e0bc6 -s ours

am skip reason: Change-Id Icd95435cfc24a66d9b6da41ccd2b996f34f03a28 with SHA-1 1f13fc1315 is in history

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

Change-Id: I2be9582a1c88a6f44f8c420e039cc61d5250a768