[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: cc8d17fefc -s ours

am skip reason: Change-Id I3aa208a36a39ee4d590b696e69f5331e73e00292 with SHA-1 3169e36977 is in history

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

Change-Id: If7af4cb3a6c10e47c7ced87af942f5efce29984b