[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: e8967e6a...

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: e8967e6a -s ours am: dbf486c9 -s ours am: c7d65a2e -s ours am: d1f719d5 -s ours am: 211eff93 -s ours am: c4f3a402 -s ours

am skip reason: Change-Id If5632242998efaec63c3e14c3528d19fcd6b9610 with SHA-1 4dc1fd47 is in history

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

Change-Id: If23d36df9cca94816c379785c53d6c9fc1ce240d