[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT...

[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: ce58b919 am: 41c1e73b -s ours am: 4a6c570a -s ours am: e462cdb6 -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: I4ea149141118cb15f0f4a4535072065ba2b1050e