Merge changes from topic "presubmit-am-a2b214c9187746a19f540e3f484d2d9b" into sc-qpr1-dev am: 6e7f0ddee1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/15860229

Change-Id: I34d44ce0913e049d335bbfaa3ac5c3b455ca6f23