tree 0800aa922f7c115d2d3b6f2ed753d2181e699ae4
parent 3c4b314fd51e060ac3f553a6f8ea3ae666b303f0
parent ca59691511539f737474966ace1f3c8b92df0324
author Bill Yi <byi@google.com> 1600494681 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600494681 +0000

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: a22469be27 am: ca59691511 -s ours

am skip reason: Change-Id Ibf0f742fc1ceb526e088c6897bd2d5a6edba2d6d with SHA-1 f497c3883b is in history

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

Change-Id: Id72686b88f50f4fce35662470613aa9133db5e3c