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

Merge changes from topic "am-bf5c0a3c14b74e2d967841198557db9f" into udc-dev-plus-aosp am: ad7930b7

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



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