Merge changes from topic "presubmit-am-f620f3c55aed4beaa5cea065806985e0" into sc-qpr1-dev am: e11469ad am: 1a9577d8

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

Change-Id: Ic5f2076d89ca9e4c85654f71bc3013e625d16ba9