[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 4b0a5287db am: 46c5b2b9b7 -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: Ie7995521670b4cdf9481d2b8976b2cc500260c52