Merge changes from topic "presubmit-am-fb1de9e365894aa2afdcbd063530de50" into sc-qpr1-dev am: 43680ba2f9 am: 8a74131783 am: 8500661472

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

Change-Id: I25b510407290124c54daff94e371dc1c1a92fb25