[automerger skipped] Merge Android U (ab/10368041) am: db616a661a -s ours am: a5e0ae1307 -s ours am: 1984c4a778 -s ours am: 595b4ee2b5 -s ours

am skip reason: Merged-In I05262c2aea17de84e1265a829c5265af8e1fbbbe with SHA-1 8f6e8914eb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/24182840

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