Merge changes from topic "presubmit-am-3aa0900245a343fba02fa81f75042cb5" into sc-qpr1-dev am: 9a80baac31

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

Change-Id: Idac231cc36376f05d62e7941624475a1bc209bd2