[automerger skipped] Merge Android U (ab/10368041) am: db616a661a -s ours am: a5e0ae1307 -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: Ifb9bc2ceb1ed21b8afd4229b321ccdcece4052db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: e8e684930eec2459ee13c27d0ca2a0cdbefcd577
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS