Merge changes from topic "am-a85daf5f57ad4c94a8e17cfffed8df36" into udc-qpr-dev-plus-aosp am: d8e2631df3

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

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