Merge changes from topic "presubmit-am-20da41396cc24d238bc6d70e9678dc07" into...

Merge changes from topic "presubmit-am-20da41396cc24d238bc6d70e9678dc07" into sc-dev-plus-aosp am: 810ecb7c am: 534d8ccb am: f5c30189

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

Change-Id: I47ce3b1aa46d9d3d500267aac32cdf397700ad77