tree 0800aa922f7c115d2d3b6f2ed753d2181e699ae4
parent 1db202e431e267ecf4f29596d8aea8b074b419d2
parent 66017a9f9216a6dad239e07c518a75e86d773eb0
author Xin Li <delphij@google.com> 1599789780 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789780 +0000

[automerger skipped] Merge "Merge Android R" am: e90c0493aa -s ours am: 66017a9f92 -s ours

am skip reason: Change-Id Iadd29bb5e9261c072ae58bcada1f1aa2fd49dbe5 with SHA-1 a105c902ce is in history

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

Change-Id: Iafec0500e7c2be4084cd43f39067500ed2500572