Merge changes from topic "am-340505ec150944a9b88ef5fcec38b52a" into...

Merge changes from topic "am-340505ec150944a9b88ef5fcec38b52a" into udc-d1-dev-plus-aosp am: ba9ab2f7

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



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