Merge changes from topic "tc_change_23042817_19" into udc-dev am: 31ba2d701e

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

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