[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: f52f17f7a2 -s ours am: be518240fa -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: Idce8789a71af9e7f1c20c09b11fe657b9334010c
tree: 99a74651440e8073e977a0e4c9efa32777f1856d
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS