[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 4cdda02fcb -s ours am: 6420bddf35 -s ours am: dcaf5a9185 -s ours am: a976f47f9c -s ours

am skip reason: Change-Id I4cefe39b93fec5647a15bc2d986a946798b6de9b with SHA-1 1e1f3e412e is in history

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

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