Merge changes from topic "am-bffb9ddeb0de4c15a168076e3071b9c6" into...

Merge changes from topic "am-bffb9ddeb0de4c15a168076e3071b9c6" into udc-d1-dev-plus-aosp am: 03cff247

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



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