[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: f52f17f7a2 -s ours

am skip reason: Merged-In I73e20e60c44cdf76fe9525036e9f58260a6b5c03 with SHA-1 5802e99977 is already in history

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

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