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

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

Change-Id: Ic8571a8a2d9bff18ee54b0b9c3f13459ac7b8528