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

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

Change-Id: I91563be49ae2d548f42dff2c90ae588c2764c611