[automerger skipped] Merge "Merge RQ2A.210305.007" am: 44f6cef15d -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id16994a954c681625d6f5107835b831fef560514