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

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

Change-Id: Ia51c96f160607be7283491c87a7362fbe91120e6