Merge changes from topic "presubmit-am-5993d312431048f889846ac42d0e78fc" into sc-qpr1-dev am: 158c0ce7 am: 2d85c861

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

Change-Id: I37d5ef0feb0ae39d1943dc9bd1b6781d856620c4