Merge changes from topic "presubmit-am-96a1f55501ab40b896d6744adf33b55e" into sc-mainline-prod am: e1ebed4b

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

Change-Id: I242691a0ddb919faae2b802e3053f1cf87a534c1