[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: 9cc9e39e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9b2ae496149253a567676cdc7ca79aa982eacb1d