Merge changes from topic "presubmit-am-3dedf333562940f1a933c99cb991bb87" into sc-qpr1-dev am: 90f616e9

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

Change-Id: I2c771a6d2b60ab49910c884c381747d57430c73b