[automerger skipped] Merge Android R am: 3c98134af2 -s ours am: a60b5ad1a2 -s ours

am skip reason: Change-Id I079159fd1a342ef4769c7f2f7642bcafe52a1b34 with SHA-1 439c1ba67c is in history

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

Change-Id: I6764fcec5d0a2c06b5faebfefe9a4f9184f36b7f
tree: ce1ae0a18576087a5e6129ed28fccdfe4f9dbc73
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS