Merge changes from topic "presubmit-am-54caa81915fb489182fffaea71a7a3bf" into sc-v2-dev-plus-aosp am: 017e5ec2

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

Change-Id: If2fec048a66d8e24d03c61c4a04bf904cf9106c6