Merge changes from topic "am-352985f888d641f78c6c89f939d5bd5b" into...

Merge changes from topic "am-352985f888d641f78c6c89f939d5bd5b" into udc-qpr-dev-plus-aosp am: 682fe718

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



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