[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO...

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 2e9d9d93 -s ours am: 650e3109 -s ours am: 7c5fbce5 -s ours am: 6aeb76af -s ours

am skip reason: subject contains skip directive

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

Change-Id: I50c6bcd68a3305194bca07f5491e5420268e95c7