[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 84a1d14b6b -s ours am: 4db6cadecb -s ours am: 535b96762e -s ours am: f96371d890 -s ours

am skip reason: Merged-In I9a5853741a07261d954816e170e6db90b1f9a573 with SHA-1 da098cb854 is already in history

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

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