[automerger skipped] Merge 24Q3 to AOSP main am: 9d4dd2320c -s ours am: d7cec3ef6c -s ours

am skip reason: Merged-In I5eff97105959bccb8a6fc7aa80a1f73c9b1cc81d with SHA-1 3dc06d7ce8 is already in history

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

Change-Id: Id778ce130eadcefe416dc65b3262c3bf6ac9bc90
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: 1a438899bae11419a840972a5ebfc71436497a6c
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS