[automerger skipped] Merge ab/7061308 into stage. am: 3555cca5 -s ours am:...

[automerger skipped] Merge ab/7061308 into stage. am: 3555cca5 -s ours am: cabc00cd -s ours am: a79f28f6 -s ours am: 7ad9d4cf -s ours

am skip reason: Merged-In I05d576339afeaca4046628c88d9738d2d970514e with SHA-1 48de8483 is already in history

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

Change-Id: Idedbfbec810c59820f2b4683b22774fe25d0867a