Merge "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am:...

Merge "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 20c9b6a9 -s ours am: e96ee054 -s ours am: c7fad3f8 -s ours" into sc-v2-dev-plus-aosp am: d45c9fab -s ours

am skip reason: Merged-In Ie81fb72a80f2d8720aedac0d5e100469b66e584e with SHA-1 201e8a2d is already in history

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

Change-Id: I4284d591906f225719c945d71a668e314f63f447