Merge changes from topic "presubmit-am-bad215e3fa6d4c4cac04525f2960e3c6" into...

Merge changes from topic "presubmit-am-bad215e3fa6d4c4cac04525f2960e3c6" into sc-qpr1-dev am: f62df4ce am: 293eb1dd am: bf4049ca

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

Change-Id: If068d1c8a742be06a9140774e135b997384fb42f