Merge changes from topic "tc_change_23042817_19" into udc-dev am: 31ba2d70 am: 224dbbc3

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



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