[automerger skipped] Merge Android 12 am: a7de7b95de -s ours

am skip reason: Merged-In If1994d3809629429ecb684d6f58b2cbd28fddd22 with SHA-1 84a1d14b6b is already in history

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

Change-Id: I591138c4d81c3094fd9c649ceb75b4cd090ebfbe
tree: e9700fa34e5e575576b01f4753f83afe9bec1f24
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. NOTICE
  7. OWNERS
  8. proguard.flags