Merge changes from topic "presubmit-am-30116051431749c9827891435041f87a" into sc-qpr1-dev am: de735839ad

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

Change-Id: I93a52e5722a4312140951750051dc8ac8dfc2607