Merge changes from topic "presubmit-am-2699987d5b5348b1a09cde7e0bf25b72" into tm-dev am: 8541e617

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



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