[automerger skipped] Merge Android 12L am: 91630b94f8 -s ours am: 3c62d9c89c -s ours

am skip reason: Merged-In I47fa16ad918be3c315a7af05e98da7ce91a1bf2e with SHA-1 f52f17f7a2 is already in history

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

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