[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: dddf0b2d -s ours am: 59834858 -s ours am: 25287be9 -s ours am: 8c48b2e9 -s ours

am skip reason: skip tag Change-Id I7d3934e1d3e2839199c169d31d89be9944837399 with SHA-1 9dcaf8d9 is already in history

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

Change-Id: I77ac9c887f54e908d8a5b32b7f249ac863c4151f