[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: e40b5ecd am: 1421fd5f -s ours

am skip reason: Change-Id I6618235ba4900ea848a19e8ab274ade484118b79 with SHA-1 650e3109 is in history

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

Change-Id: I53dc39218c9cef1d241b3652dacade0a895968ac