[automerger skipped] Merge Android R am: 4bc06ac1af -s ours am: e1158d8c0d -s ours

am skip reason: Change-Id I23245c41193902c90a8fe44ec44ce91d76cdf294 with SHA-1 4cdda02fcb is in history

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

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