[automerger skipped] Merge Android U (ab/10368041) am: 4e1da33538 -s ours am: 55ce748ab4 -s ours am: bf158ce65a -s ours am: 195e445f62 -s ours

am skip reason: Merged-In Ifd3de30954ef544a35af280d002e6b239b7ba329 with SHA-1 d9b5b6bd0e is already in history

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

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