[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 5632ad1813 -s ours am: 4bf7d9e8d2 -s ours am: 3f90077daa -s ours

am skip reason: Merged-In I72b92d550e4ed596bcceb82838fb3b7a28c062a0 with SHA-1 041fa0d8e0 is already in history

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

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