[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 2e9d9d93 -s ours am: 650e3109 -s ours

am skip reason: Change-Id I2f184a8c43c83c1946b8096fd59d5e04988f5100 with SHA-1 5e387fe0 is in history

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

Change-Id: I53642a25d7a20f40bb4510e4752c276170a3d0cf