Merge changes from topic "am-0044f066ae544b2db72e3759316cdaf7" into udc-d1-dev-plus-aosp am: 210bdbe6

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



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