[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: a22469be27 am: ca59691511 -s ours am: 219a856216 -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: I094c09ea5c14340329dc4186146dee9dc193e22d