Merge changes from topic "am-99e71ad1563b4cdeb52b5ebeabd86305" into...

Merge changes from topic "am-99e71ad1563b4cdeb52b5ebeabd86305" into udc-qpr-dev-plus-aosp am: 39ed8146

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



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