Merge changes from topic "tc_change_23041807_28" into udc-dev am: e113cce4de am: 47d671f759

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

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