[automerger skipped] Merge Android R am: 3c98134af2 -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: I9b09b8dee6fa4a291a76e8631ced144fefc9320c
tree: 683d222101913ee4851aafae2183862ff5cb721b
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS