Merge changes from topic "presubmit-am-3dedf333562940f1a933c99cb991bb87" into sc-qpr1-dev am: 90f616e9 am: 797bf1a1 am: 1635dca9

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

Change-Id: I7005cb1e19dc327f5b1409881c329cfd3b0cd8c0