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

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

Change-Id: I5e5274bfc5032073c14faf4b53faf13404f3b683