Merge "TvProvider: Reduce synchronized block" into main am: 6b0378d616 am: 5ffa88ac6f am: 3afae03f80

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

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