Merge changes from topic "presubmit-am-baca0ede84674175a9bb058e662c605a" into sc-qpr1-dev am: e49133bca0

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

Change-Id: I4e054a19ff76f2d3c47a912f9497b07cf76ea73e