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

[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 34bdbc0a -s ours

am skip reason: Merged-In Ic3144e827fcc527609b2f9ccd68034e73142349e with SHA-1 be3152e6 is already in history

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

Change-Id: I7bce60ba1c579da1ff3219dce57c33cb51a78f87