Merge changes from topic "presubmit-am-fb1de9e365894aa2afdcbd063530de50" into sc-qpr1-dev am: 43680ba2f9 am: 9f726df087

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

Change-Id: I8e50554b36482167a3f2bd677508396edbb9f677