[automerger skipped] Merge ab/7061308 into stage. am: 8901b5c2f5 -s ours am: dbce61aa10 -s ours am: 64cbed2962 -s ours

am skip reason: Change-Id Ie385b8d41a75309e197ade1d6d19a6d5a8e945bb with SHA-1 bc2d2afa37 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38c93296cce93f7a2d690733ab814ce2eb21e603