[automerger skipped] Merge "Merge RQ2A.210305.007" am: 44f6cef1 -s ours am: 2b61818a -s ours am: 67171ee1 -s ours am: 2afb0d63 -s ours

am skip reason: Change-Id Iff02f9c0e289a4e9c907d2f42dcfdbea54322970 with SHA-1 3555cca5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a5f4cea0019d0d3b15a25b6536ff8d19fd5dad0