Merge changes from topic "am-93ebdb9c83cd4ab99a7cb222f03a27b2" into...

Merge changes from topic "am-93ebdb9c83cd4ab99a7cb222f03a27b2" into udc-d1-dev-plus-aosp am: 377efb0c am: 2807fc9d

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



Change-Id: I472ac314350997df5aca30ec5304f516f55dbb6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>