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

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

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



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