[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE" am: 808bc1b8 -s ours

am skip reason: Merged-In Ia663e78904a28fd4c73a2f28cd9581564c6b6fa6 with SHA-1 8551b250 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/1763470

Change-Id: Ia3235b47dc104b9584fed0334345e7e4b28bc981