Merge changes from topic "tc_change_23041807_28" into udc-dev am: e113cce4de am: 3700406a26

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

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