Merge changes from topic "presubmit-am-5993d312431048f889846ac42d0e78fc" into...

Merge changes from topic "presubmit-am-5993d312431048f889846ac42d0e78fc" into sc-qpr1-dev am: 158c0ce7 am: 61e7e208 am: 73a2b3ea

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

Change-Id: If35372f3a23b49dc7f0fcbf13dc96c0870f254f0