[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: 7183b539 -s ours am: 16b48e15 -s ours am: 77aa123b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I07e073c504ae265976a571ef83556b8de31bb686