Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: a22469be27

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

Change-Id: Icf3ce6de0fc298e6af1e60b34921b122f324e968