[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 72d08e662d -s ours

am skip reason: Merged-In Iefadf67486a7b4e531af9be96045b80f0d9fae81 with SHA-1 a27eec4be1 is already in history

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

Change-Id: If121dd7236db72108870be0b4204ae4b6522d8fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: e2d8179a58108ec34bf5987119fff13f13b91593
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS