Merge changes from topic "tc_change_23042206_46" into udc-dev am: f5654198

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



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